Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 01:04:51 +0000 (01:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 01:04:51 +0000 (01:04 +0000)

Trivial merge